From: Joakim Verona <joakim@verona.se>
Date: Mon, 26 Aug 2013 07:12:15 +0000 (+0200)
Subject: merge from trunk
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=40d74a503910168002cb1e170494d2f6d1adfeba;p=emacs.git

merge from trunk
---

40d74a503910168002cb1e170494d2f6d1adfeba